Fix Square example...
Switch to new style list comprehensions

Also, try to increase code niceness