apply coder suggestions