getter setter rules refactoring. some cleanup.