Cleanup & refactor + Chrome messaging introduced