adjusting some code and formatting