Increase code Quality