Some little code readability improvements
Some little code readibility improvements