Cleaned up code + fixed ellipse