cleaned up the code and continued