Slightly cleaner initialization