Little bit of code cleanup and whatnot.