Kavitha - Refactored with recommendations from lint report