Removed some uncessary comments and cleand up code.