Fixed some style bugs