Removed unncessary comments and methods