(COMMIT-77) Code clean-up