Small refactor

Changed members names for clarity
Padded the list items