Clean up a few things, add some consistency