Updated code according to remarks.

Didn't set up the "right format" thing yet.

 I see a lot of modified files, I'm not sure why.