simple sql + style changes..