reformatted sources; issue #25