Trying to improve the Scanner