Fixed spacing and added logging