code comments and refractor