de-uglified a bit