moved orm check to separate methods
removed unnecessary namespacing