Shortened code in places