Documentation, and getting rid of snarky personal notes
Better splitting of the selector