Simple Clean up cuz of return types. Thank you Clang.