Made code more consistent. Added a set and get method for fill color so that it can be set dynamically if need be.