Debug

Cleaned up code