Additional suggestions by ReSharper and refactorings
Initial storage services class
Find algo