Cleaned up more lines