Move more lines to common init