more consitent and simpler style
code bit cleaner since we do know where we are going now