Some more tweaks / cleanup / readabilitiy