small style changes + new test level
refatoring: making everything final that can be