Refactoring
Spring cleaning!