Clear some logger output. Add wrappers for some function. Better naming
and protected from mistakes in specifications.