More minor variable optomization