removed 1 new line char
some cleanup