Fix context description
Remove some code duplication