Fixed error, more incremental style changes