Just a little refactoring and small formatting changes.