#102 code clean