Cleanup and use .to_sym