Commit # Refactoring