Reorganize oneliner to start with main