Update for Sublime Text 3 + Cleanup

Cleanup some code + updated for Sublime Text 3.