Code shortened