Some more stylistic changes
Getting ready for all the merge issues ever
Maybe we're ready...
Maybe we're ready...