Minor fixes - mostly shortening long code lines