Cleanup for newer rubocop constraints, also beginning to switch indentation to ruby's 2 spaces standard