[All] Break up functions for clarity