some cleanup of code