Program wide cleanup. Organized imports and did some formatting