Cleaned it even further