Refactoring2

Constants as well for color would be nicer