4th upload, cleaning code