Clean up code

Three clean-up commits