Updated comments / documentation