Clean up of comments
Fixed layout to auto-resize.
Removed postfix from add-method
Refactored main program