Fix code indentation, more closely align to Github styles