Fix spacing on switch statement
Match method signature
More docblock fixes