Addressed some style issues