General Code Cleanup

Changed a few methods around, removed a few unused imports. The usual.