* const and minor cleanup