always nice to increase maintainability by removing code :-)