Cleaned up class names and such.