Keep eliminating hardcoded angles