clean up style, allow for commented users