Some little changes for a more readable code