Standardize gem
Final cleanup