Fixed some missing new-lines and unused modules