Clean up Storage class; story #36
Signed-off-by:Arie <arieclaassens@gmail.com>