few comments and clean ups