Split stroke and fill into separate functions