readability changes

changed comments, moved things around.