chore(engine): small code clean ups

related to #CAM-2544