Implement @josevalim's suggestions