General Funcs Cleanup

Finally