Bug fix and indent