Formatting

Added some rudimentary caching, as well as better formatting and clearer output.