Continued refactoring and updated production site