Removed some comments and alligned the code