Combined some functions and updated PHPdocs accordingly.