Simplify..., improve readability, less copy/pasting