changes in indentation and naming