Got rid of goofy class and useless comments