closes #7, fix style