Refactoring - removed string dependencies