Fix some comments and cleanup a bit