move some things around and make it look cleaner