Clean up code and check functionality of current progress.
Clean up code and check functionality of current progress.