Code review fixes, some conventions