merge better styles
style better
merge to master