Fixed stylistitic stuff