Code consistency improvements, changed project type field to int