Fix for indentation and orphaned code section