Removed unused parameter
Cleaned up the code
Removed some debug lines