Cleaning some stuff up

Trying to organize a bit.