Remove empty columns found in the polar during saving

Remove empty columns during saving of polar.

This fix will remove empty columns found in the polar during saving.
Also beautified the code, hence a lot of updated lines.