Clean code, remove hideous yellow outline, and remove junk files