Replaces id with instancetype
Fixes tab issues
Fixes tab issues. Part II
Fixes tab issues. Part III
Merge pull request #328 from Simperium/issues/326-code-cleanup

Code Cleanup