Continued code clean up