Fix for issue #5 and some other formatting.