cleaned up code to compile