Just some code cleanup stuff.