20140825 _ 2°
Clean code