major name refactoring and code cleanup, significantly less strings