Cleaning up Ability class