* Extracting BufferedReader feature from my other branch to make a separate PR. * Renaming a file. * Code cosmetics. * Code cosmetics.