A separate commit with a compressed style for changes done to issue #31