Client code beautified