- System.out cleanup

- Enroll/Disenroll user-friendly fix