Check in code clean up