Clean up documentation
Clean up and more readable code