Refactoring - mar, pad, colors