Fixing drawing angle bug
Clean up