cleanup, adding more feedback, making it prettier