Fixed coding style on variables and removed class comments