Fix inconsistent indents, also fix some notices bugs.

Hi #5