More Updates from RailsBP

Code changes based on recommendations from RailsBP.