Auth code clean. and other annotations added.