Cleaned up setup a bit.