pretty code,clean code, less old commented out code