Adding #import so this file doesn't seem so pretentious.
Deleting newly unused function.
Renaming a few functions.