Updated code style to minimize applications ($) and maximize compositions (.)