Minor code syntax improvements