Cleaning up lib/core/* for consistency