Cleanup styling an JS, remove cruft