Remove extra spaces inside %w(), fix allignment