Fix #1 - Bring indentation to its final stage