fix: better defaults && a bit clean up