Separated skills and player types, made some small optimizations