Even moar def cleanup