Fix severe indentation problems, and also the funky way to get the last item

of a list (which is also a small performance hit).