Improved comments and rearranged names.