Minor code arrangements