Rearranged imports, removed unneeded helpers