- Remove extra debugging
- Update coding style