Reorder and locate call initiation routines to improve re-use of code