Minor: Cleanup of some functions, and stuff