Renamed some variables and methods to more appropriate values
Added correct checks for file operations (I'm mastering more in EasyMock)