Code cleanup

Added one line in the end of each file and
improved variable names