Cleaned up commented property