Code reformat + some spelling fixes