Minor changes to better suit hexagonal symmetry, cleaning.