comments, clean/fast code refactoring.