indentation & useless comments fix