Code cleanup ; Fixed scatter documentation