Cleaned up main class.