House cleaning

Cleaning some stuff up