Lots of rewrites: A bit more prettier code