Indentation fixes and removal of unused texts.