Removing whitespace
phpdoc updates
Starting work on choice attribute value implementation