Cleaned up code, will compile
Cleaned up code, will compile