Main now much cleaner...