Reindented and fixed bugin coverage.