Cleaning up code
4/1