code cleanup, hopefully :P