Sugestion minor tweeks.