Cleaned up code and removed residual debug statements