Refactoring (screwed up my bad)