Various minor changes

Various minor changes for better code readability.