Cleaned up some properties.