fixes #6
fixes #4
formatting