Minor code moving