Done with editing minor issues and cleaning up my code