code aesthetics cleanup