Improved code readablity 

Made some small changes to improve code readability.