Patch Set 5: Looks good to me, but someone else must approve

No worries, I am all for dictatorship and enforcing very strict rules when it comes to code style :) I was using Eclipse, but yesterday decided to give IDEA a try, that caused the incorrect indentation. Hope everything looks good now.