Cleaning up extension. Still working on bugs :(