Minor changes for better reading of the code