Cleaned up; ran with -w