updated merged code to match pre-existing style.