Please improve the grammar in the given sentence.
The main steps to consider in a good and proper housing system are the affordability, durability and safe living conditions.
The main steps to consider in a good and proper housing system are affordability, durability, and safe living conditions.