Streamlined some logic in unit creation