Dev Some minor code simplificiation.