Moved around and cleaned up