changes in files and fixing style