Refactoring and removing fluff