cleaned up and made proper.