cleaned up some formatting and in-line functions in Avatar.cpp