More refactoring
Removed some extra code