Organise paths/branches per function.
Use slightly better function names.