Ensured that the function aliases are loaded
Fixed up formatting