fixes for readability