Done some code clean up here.