Working on readability of code