made some more or less visual changes to the code