Minor change to storage initialization
Pretty print the sample files
Code cleanup