Removed unused variable
Added newlines at end of files
Added todo comment