Added neat, and cleaned up