Main Cleaned up.