Removed __functions, minor formatting