Fixes coding style and removes debug output