Fix mistyping && Refactoring(little bit)