init minor cleanup