code clean up for oriatation, not correct yet