slight code clean up