[IMP] Splitting bigger methods into smaller ones