Fix style consistency issues in Storage