Simplified even more variable names