Numerous but minor refactorings to bring code more in line with the Ruby Style Guide