fix #7 - Style fixes