Combine helper files
Remove note
Change method order