vigo: slightly cleaner