Minor code cleaning (whitespace, line breaks)
More minor code cleanup
Added a little bit of caching, with instructions