Code cleanup for Storage Module