Move some stuff to constructor declarations