minor fix
more flexible code block
inlining of code declarations