Minor refactor for better code style