Update formatting and improve documentation