Small fixes, code style