Refactor

Minor refactor