Fixed style issues as per comments in #93