Removed comments
Fixed memory leak.