major clean up.. more to come
removed unnecessary comment lines