Code made ​​clearer, with outsourcing