removed erroneous 'return false' from last commit and minor style changes.