Code improvements related core 1485