cleaned up the properties a bit