Fix signatures, alignment.
Move quotes to the class definition.