Cleaning up the codebase based on checkstyle suggestions.

Change-Id: Ifbb79e7bf25ec20d301ead2a04a27d8cc12179e2
Reviewed-on: http://review.couchbase.org/23989
Reviewed-by: Deepti Dawar <deepti.dawar@globallogic.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>