Updated comments/signatures/formatting.