Refactored initialization and decoration drawing.