Issue #177 - Improved library formatting