Improve to follow docs