Use global vars & typo fixs