Amr

Code cleanup.