reformatting to fit code styles