Tweaks to the gem for better organization