code optimized, names changed
backup files cleaned