Streamlined setup a little