fix formatting, and few comments