refactored a bunch of things, made comments