Improves formatting, updates documentation