Code reformatting & cleaning
Typo correction