More cleanup and commenting...