Adding some style improvements