Fixed overfull warning and added good practices