Small changens to enhance readability of code