Minor refactorizational's