code cleanup, moving objects not working