Cleaned up logging on JS side