Just some code structure changes