cleaned up cutesy
removed duplicate definitions