code refactoring
Minor improvements