bit more comments and cleanup