Improve bullets group code