clearn up main
typo & clean up parser