Start splitting into smaller functions
More splitting