cosmetics: the original code style is horrible...