Removed unused classes, made the output of command line search more readable and not just a vardump