Style fixes and addressed review comments at #221