Fixing style issues. Removing explicit inline statements.