More clear code