Continued cleaning up ls.cpp