Code tidy, fix 'prepare' call