Just some standard refactoring, yoooouu knooooow