Attempt to reduce the code pyramid