Fix bug with blank lines, change formating