Cleaned up properties