Micro optimizing previous commit