ANSI 'sexiness', more refactoring