compacted some straightforward parts