fixed some lines to fit proper context