improved positioning
brought modularity in main class