Cleaned parts of pure_neat