Fix whitespace
Remove Debug Statements