Fix gem name. Clean up a little bit.