Suggested improvements from Petr