renamed "Head" to "Avatar" and cleaned up some comments to comply with coding standards