update gems
arrange code and style