some basic renaming and styling modifications