cleaned up cli case stmt and entry formatters
refactor find class
refactored queue a little