Refactoring to pretty up docs