clean up debug message
remove android verion check
refine variable naming