Some style changes, still working...