Well, that was a long shower, now wasn't it!

Finished algning code, but not variable rename.