style and usage changes, nothing huge