several changes and identation
views identation
refactoring and refactoring