Some comments and clean-up