Removing debuging info
Small refactoring.