House Cleaning

Committing things I should have committed long ago