Added support for lowering identifiers + cleanup