Added comments, cleaned constants and file names