Cosmetics
Reindent
Use Table for the given list
Add replace feature