trying to get this cleaned up