code cleanup and refine styles
test both yaml and yml files under _data