Fixed too long code lines