Removed public keyword from some types