Add documentation and white-space for better readability