updated color :) cleaned code / more friendly