Fine Tuned Tracking parameters, cleaned up code