Improve console program