StorageLabel Commit: Refactored & QA to java coding standards