Fix something
improvement maintainability