My code changes reorganized (coding style, some more comments)