refactor for clarity
further refactoring for clarity
remove redundant file
even more refactoring for clarity
a few necessary comments