Added composer dev dep and extracted bartoint functions