Minor code cleanups - left from previous patches

This closes #225