yay! code cleanup! :D