Cleaned up properties code.