Improve clearness of code