remove old inject references
added explicit property definition
refactor for maintainability