Remove redundant this. and tidy android manifest