Minimize warnings, cleanup excess spaces