Modulated code and cleaned up main function (#2) 38f10df verified wu981526092 Natedem30 commited on May 15
