Some refactoring and code editations