Changed function comments to doxygen style short comment
refactored constant names to follow consistent style