Document more, rename method to be more indicative of what it does [MJ-198]