Code

Fixed some errors detected by Eclipse