Working version
Reindent