Continued style refinement and code refactor