Code reformatted (issue #82)