some lame styling
merge