Simplified plot call, moved calculations inline