styling
merge cleanup by jackaperkins