Comments and code clean up