fix some spacing, remove some unsused imports and variables
Merge origin/master