Fixed some style issues
Updated to reflect fixes