Clean usage of pass
More tweaks