Cleaning up and formatting

Changed to Scanner instead of BufferedReader for easier code and more
functionality.