Add titleize, cleanup comments