Add a comment and replace some class references

Also, removed some unused headers, and moved the constructor/destructor
functions to the top