Fix type and blank lines