More code convention enforcing