Break up long methods into smaller ones (unfinished)