Cleanup stuff

Just some minor things really.