begin to clean up code and let things breathe