Changed some class names and cleaned up.