Fix bug #1 and indent