Removed Debug Code and fixed Names