Updated PHPDocs and removed useless variables