start of some code cleanup. just movement here