Organize and abstractify