Correcting some style issues