Cleaned up declosurify