Done some more code clean up.