+ Few changes for style