commenting/refactoring random a tad