refactoring
style improvements

unignore gitconfig
refactoring