Cleaning

Cleaning up unnecessary codes. Tidy up code identification with my
preferences.