Removed string getters/setters; refactoring