formatted more functions