Adding back style changes before the merge and also addresses an issue discussed in issue #50