Cleanup Code

No changes to codes.
Fix tabbing and comments that are not needed