Code cleanup and refactor
Storage requests debugging and formatting