Clean things up and refactor for the hell of it