Got rid of main class & cleaned code.