Minor refactoring
Minor refactoring


thibmo/kam_remake,reyandme/kam_remake,reyandme/kam_remake,reyandme/kam_remake,reyandme/kam_remake,reyandme/kam_remake,thibmo/kam_remake,thibmo/kam_remake,thibmo/kam_remake,thibmo/kam_remake