changed some docblocks to work with the naming convention