styling and possible fix... close #127