some updates for better readability