Move extra line into macro