Refactor to Bitter implementation