Make simple code improvements