Move some parameter initialisation to initialiser list
Fix make clean