Style fixes and Fixes #91