More performance, less complexity

More performance, less complexity