Refactor piece a bunch