Code cleanup, formatting and Organizing Imports