Fix code indent format

Fixed some code indentation & code cleanup ;>