more refactor formatting.. will continue tomorrow