additional cleanup from comments