organize, remove unnecessary calls