cleaned up some extra params, changed function names for readability