-Code cleanup, Console app