Minor source cleanup: .h->.hpp, changed quotes to angle brackets