Little fixes: syntax, cleaning