Minor cleanup

Really need fix up our code, starting to get spaghetti-ish