Style tweaks

Signed-off-by: emanuele <emanuele45@gmail.com>
Lang improvements and more tests

Signed-off-by: emanuele <emanuele45@gmail.com>