Optimise storage and close #19