Refactoring & properties externalization
fixed command-line error message