Cleaning up the code, removing the silly stuff