refactoring for better naming, updating comments and general cleanup