Replaced $core uage
Tidying