Fixes

And also, please indent well.