Cleaning up Scanner, added Token class