House cleaning

Cleaning up some things