adjusting to coding style of current codebase I am dealing with