Minor formatting changes
Remove unsed references
Removed unsed references
Removed unsed references, minor formatting changes
Debugging