Adding some functions for better testing, also, rewrite some comments

ref: T6
type: consolidation/testing