Improve lisibility of code