Applied formatting and cleanup since merge a98f9bc6a7770b7eddc8ef9418d576ddd804f10d