Refactoring... Lots of insignificant changes