Replaced $core usage
Tidying