Cleaning up little crap

Trying to get as much of the easy stuff done before I have to deal with
getID()