Code cleanup :)
Many cleanup; such debugging