refactor alert
refactor polygon
cleanup formatting