Cleaning up Storage.java