Change title & improve indentation