Remove commented out code and organized imports