refactor some namzing