even more code clean up