style: space arrow function
consolidate piece-related code