Updated text, case and some style