Cleaned parts of pure_neat
Cleaned parts of pure_neat