rearranged entries, optimized imports, fixed typos