Cleaning up code more.