Cleaned code, changed the angle fix