Fixed missing line jump after entries, simplified code.