Remove redundant code, add colors (sic)