Clean up code and increase circle size