Refactoring, removed redundant properties