Fix #104 - Style, small fixes