Removed more redundant code/fixed Skills counting