Attempt to reduce method complexity