Clean code
Merge remote-tracking branch 'nostra13/master'