moving more things around just cleaning up