Show new line
naming cleanup