general cleanup, no functionality changes