Here we go
Small style fixes