Cleaned some code to avoid lines to be longer than 80 chars