Tidying and working on adding support for Chrome