Updated formatting of merged code to better match the rest of the codebase