Refactor
rm legacy files
Reformat / recolor