Improvements based on feedback from @puentesarrin #69.