just some comments and cleanup