Promote readability, fix errors