Cleaned code, updated GA to async, added event tracking