Update type specification
Refactor repeated expression