Simplify, or rather making it shorter