Improved the comments and split huge one liners