diff --git a/openstack/blockstorage/v1/snapshots/requests.go b/openstack/blockstorage/v1/snapshots/requests.go
index 7dcbc46..0e4e8f8 100644
--- a/openstack/blockstorage/v1/snapshots/requests.go
+++ b/openstack/blockstorage/v1/snapshots/requests.go
@@ -8,14 +8,20 @@
 	"github.com/racker/perigee"
 )
 
+// CreateOpts contains options for creating a Snapshot. This object is passed to
+// the snapshots.Create function. For more information about these parameters,
+// see the Snapshot object.
 type CreateOpts struct {
-	Description string
-	Force       bool
-	Metadata    map[string]interface{}
-	Name        string
-	VolumeID    string
+	Description string                 // OPTIONAL
+	Force       bool                   // OPTIONAL
+	Metadata    map[string]interface{} // OPTIONAL
+	Name        string                 // OPTIONAL
+	VolumeID    string                 // REQUIRED
 }
 
+// Create will create a new Snapshot based on the values in CreateOpts. To extract
+// the Snapshot object from the response, call the Extract method on the
+// CreateResult.
 func Create(client *gophercloud.ServiceClient, opts *CreateOpts) CreateResult {
 	type snapshot struct {
 		Description *string                `json:"display_description,omitempty"`
@@ -49,6 +55,7 @@
 	return res
 }
 
+// Delete will delete the existing Snapshot with the provided ID.
 func Delete(client *gophercloud.ServiceClient, id string) error {
 	_, err := perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
 		MoreHeaders: client.Provider.AuthenticatedHeaders(),
@@ -57,6 +64,8 @@
 	return err
 }
 
+// Get retrieves the Snapshot with the provided ID. To extract the Snapshot object
+// from the response, call the Extract method on the GetResult.
 func Get(client *gophercloud.ServiceClient, id string) GetResult {
 	var res GetResult
 	_, res.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
@@ -67,12 +76,15 @@
 	return res
 }
 
+// ListOpts hold options for listing Snapshots. It is passed to the
+// snapshots.List function.
 type ListOpts struct {
 	Name     string `q:"display_name"`
 	Status   string `q:"status"`
 	VolumeID string `q:"volume_id"`
 }
 
+// List returns Snapshots optionally limited by the conditions provided in ListOpts.
 func List(client *gophercloud.ServiceClient, opts *ListOpts) pagination.Pager {
 	url := listURL(client)
 	if opts != nil {
@@ -89,11 +101,16 @@
 	return pagination.NewPager(client, url, createPage)
 }
 
+// UpdateOpts contain options for updating an existing Snapshot. This object is
+// passed to the snapshots.Update function. For more information about the
+// parameters, see the Snapshot object.
 type UpdateOpts struct {
 	Description string
 	Name        string
 }
 
+// Update will update the Snapshot with provided information. To extract the updated
+// Snapshot from the response, call the Extract method on the UpdateResult.
 func Update(client *gophercloud.ServiceClient, id string, opts *UpdateOpts) UpdateResult {
 	type update struct {
 		Description *string `json:"display_description,omitempty"`
diff --git a/openstack/blockstorage/v1/snapshots/results.go b/openstack/blockstorage/v1/snapshots/results.go
index 363d6e2..3a27592 100644
--- a/openstack/blockstorage/v1/snapshots/results.go
+++ b/openstack/blockstorage/v1/snapshots/results.go
@@ -9,28 +9,39 @@
 	"github.com/mitchellh/mapstructure"
 )
 
+// Snapshot contains all the information associated with an OpenStack Snapshot.
 type Snapshot struct {
-	Status           string            `mapstructure:"status"`
-	Name             string            `mapstructure:"display_name"`
-	Attachments      []string          `mapstructure:"attachments"`
-	AvailabilityZone string            `mapstructure:"availability_zone"`
-	Bootable         string            `mapstructure:"bootable"`
-	CreatedAt        string            `mapstructure:"created_at"`
-	Description      string            `mapstructure:"display_discription"`
-	VolumeType       string            `mapstructure:"volume_type"`
-	SnapshotID       string            `mapstructure:"snapshot_id"`
-	SourceVolID      string            `mapstructure:"source_volid"`
-	Metadata         map[string]string `mapstructure:"metadata"`
-	ID               string            `mapstructure:"id"`
-	Size             int               `mapstructure:"size"`
+	Status           string            `mapstructure:"status"`              // currect status of the Snapshot
+	Name             string            `mapstructure:"display_name"`        // display name
+	Attachments      []string          `mapstructure:"attachments"`         // instances onto which the Snapshot is attached
+	AvailabilityZone string            `mapstructure:"availability_zone"`   // logical group
+	Bootable         string            `mapstructure:"bootable"`            // is the Snapshot bootable
+	CreatedAt        string            `mapstructure:"created_at"`          // date created
+	Description      string            `mapstructure:"display_discription"` // display description
+	VolumeType       string            `mapstructure:"volume_type"`         // see VolumeType object for more information
+	SnapshotID       string            `mapstructure:"snapshot_id"`         // ID of the Snapshot from which this Snapshot was created
+	SourceVolID      string            `mapstructure:"source_volid"`        // ID of the Volume from which this Snapshot was created
+	Metadata         map[string]string `mapstructure:"metadata"`            // user-defined key-value pairs
+	ID               string            `mapstructure:"id"`                  // unique identifier
+	Size             int               `mapstructure:"size"`                // size of the Snapshot, in GB
 }
 
-// ListResult is a *http.Response that is returned from a call to the List function.
+// CreateResult contains the response body and error from a Create request.
+type CreateResult struct {
+	commonResult
+}
+
+// GetResult contains the response body and error from a Get request.
+type GetResult struct {
+	commonResult
+}
+
+// ListResult is a pagination.Pager that is returned from a call to the List function.
 type ListResult struct {
 	pagination.SinglePageBase
 }
 
-// IsEmpty returns true if a ListResult contains no container names.
+// IsEmpty returns true if a ListResult contains no Snapshots.
 func (r ListResult) IsEmpty() (bool, error) {
 	volumes, err := ExtractSnapshots(r)
 	if err != nil {
@@ -39,7 +50,7 @@
 	return len(volumes) == 0, nil
 }
 
-// ExtractSnapshots extracts and returns the Volumes from a 'List' request.
+// ExtractSnapshots extracts and returns Snapshots. It is used while iterating over a snapshots.List call.
 func ExtractSnapshots(page pagination.Page) ([]Snapshot, error) {
 	var response struct {
 		Snapshots []Snapshot `json:"snapshots"`
@@ -49,11 +60,16 @@
 	return response.Snapshots, err
 }
 
+// UpdateResult contains the response body and error from an Update request.
+type UpdateResult struct {
+	commonResult
+}
+
 type commonResult struct {
 	gophercloud.CommonResult
 }
 
-// Extract returns a pointer to the Snapshot from a commonResult.Resp.
+// Extract will get the Snapshot object out of the commonResult object.
 func (r commonResult) Extract() (*Snapshot, error) {
 	if r.Err != nil {
 		return nil, r.Err
@@ -69,14 +85,3 @@
 	}
 	return res.Snapshot, nil
 }
-
-type GetResult struct {
-	commonResult
-}
-
-type CreateResult struct {
-	commonResult
-}
-type UpdateResult struct {
-	commonResult
-}
