cleaned up properties