fixed whitespaces and naming