Cleaned up Handbook output