refactor code and improve colors