Just corrected some lots of changes as a refactoring..