oops, I did it again: simplify a lot of code :]