mahendra | #208 | refactoring