Initial cleanup - fix indent and catch end of file when reading videos
Fixing one letter variable names