add hamcrest-all to classpaths and minor formatting fixes