Reformatted code and added " "  hack for windows
Removed old class