Hopefully this is the last clean-up commit before serious development happens