Refactor and visual changes

variable names and updated cooldown circle