refactor & colors