cleanup and clarify usage