rework PSR2 & package custom target type fix

rework PSR2 & package custom target type fix