Tried to fix some style