Changed to use cleaner syntax on initialization.