clean up code format to fit the rest of the the application.