Improving the main class.