Some comments and clean ups