Making stuff less ridiculously large