Done some code clean up