cleaned up things so that they compile