prettify main by indent/align
Drop old code
Merge pull request #6 from yaccz/main-cleanup

Main: main formatting and cleanup