clean code
prepare uploading to my local web site
fixed minor issue