remove comments, unnecessary spec, improve style.