Cleaned up and move some things around