Combined content functions, cleaned up coding standards