Minor code and syntax cleanup