Reindent + Fixes #27