Issue #121 - Fix indentation and remove empty lines