revert the last few commits
bu,ping version number
whitespace
refactoring names