Changes (mostly formatting) to fit all the code in 80 chars width