refactoring - code is more encapsulated/cleaner with rigger approach.