Updated parent storage class name and minor fixes and cleanup