Wrap long line
Better function names

Follow PEAR coding standard for function names.