Code Cleanup
Inspection
Reformat