Refactoring part1
Bit more tidy up. Plus a sphere