added starter and cleaned up