Attempting to clean up better