Code Cleanup

Cleaning up some codes and tidy up code indentifications based on my
preferences.