Better comments. Remove commented code.