Ruby style cleanup