Readability of the code improved