Cleaned-up Storage methods