Improve use of org in personal initialization