remove todo and tidy array members