code cleanup, yay