styles refactoring
style refasctoring. Merging and fixing conflicts