Begin prototype style refactoring