small fix
refactor + code structure