Various
Refactoring a lot of stuff
refactoring
fixing space issue
Merge remote-tracking branch 'origin/master' into GithubDeleteBranchFeature