removed ls variable, improved formatting