code clean up!