Added code cleaner to verify that the functions are used correctly