SS: Complete Code Refactoring