Organize Imports on development channel and some code tweak