Cleanup code to be beautiful and get a personal victory