Add #titleize! and make some refactoring