cleaned code up, some minor refactorings local to methods, added and removed some comments