Make changes based on suggestions from kemurphy