Misc code cleanup, commenting & formatting
removing some temp files that shouldn't have been comitted