Refactor of main class