better naming convention and comments in file