5.3 PTR Update

- Cleaned up code.
- Reduced function calls.