More strict wrt. PEP 8