Cleaner code

Fixed Comments