StorageMain COmmit: Refactored and QA to java coding standards