cleaned up code and made circles filled