Minor Ruby style and module usability cleanup
resolving merge conflicts, hopefully
finish merge