Improved code format slightly