335 Refactoring