code clean up - organizing