Cleaned enum up a little