Refactoring. Cleanup. RSpec upgrade. Etc...