[imp] pos: small improvements and clean the code.